Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 12 Sep 2011 19:50:44 +0000 (12:50 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 12 Sep 2011 19:50:44 +0000 (12:50 -0700)

Trivial merge